ci: Add mesa-libGLES-devel

Try again, since libglvnd-devel is not the right choice.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7514359ed301c40174de7b34286d755562adf0bc..00624776e5db352b268db3b6f56a41b8fd585049 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,7 +24,7 @@ variables:
   BACKEND_FLAGS: "-Dx11-backend=true -Dwayland-backend=true -Dbroadway-backend=true"
   FEATURE_FLAGS: "-Dvulkan=enabled -Dcloudproviders=enabled"
   MESON_TEST_TIMEOUT_MULTIPLIER: 3
-  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v26"
+  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v27"
   FLATPAK_IMAGE: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master"
   DOCS_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora-docs:v25"
 

diff --git a/.gitlab-ci/fedora-base.Dockerfile b/.gitlab-ci/fedora-base.Dockerfile
index f61a8fc3cf2fc67f18870d64112409659905dcd4..613d492d344ce1ab5ff6cadff3b34cdaa563d943 100644 (file)
--- a/.gitlab-ci/fedora-base.Dockerfile
+++ b/.gitlab-ci/fedora-base.Dockerfile
@@ -47,7 +47,6 @@ RUN dnf -y install \
     libcloudproviders-devel \
     libepoxy-devel \
     libffi-devel \
-    libglvnd-devel \
     libmount-devel \
     librsvg2 \
     libselinux-devel \
@@ -66,6 +65,7 @@ RUN dnf -y install \
     libxslt \
     mesa-dri-drivers \
     mesa-libEGL-devel \
+    mesa-libGLES-devel \
     mesa-libwayland-egl-devel \
     ninja-build \
     pango-devel \

diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile
index e380ef78d798f71c0cec1706fac4b5adb07aefbc..ddcc18f2878206dc929b3023f66d7eee0205b65d 100644 (file)
--- a/.gitlab-ci/fedora.Dockerfile
+++ b/.gitlab-ci/fedora.Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v26
+FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v27
 
 # Enable sudo for wheel users
 RUN sed -i -e 's/# %wheel/%wheel/' -e '0,/%wheel/{s/%wheel/# %wheel/}' /etc/sudoers